LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,480 Commits 2 Branches 0 Tags
d25bf1efdd7c3d94d319930568c908a1dfb5edab
Commit Graph

14480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Moyer
0478f3fe65 am eea325e5: am 510fca8b: (-s ours) am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 
* commit 'eea325e5583803228a06d1a3395b6f994d45619b':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
 2014-04-04 16:54:06 +00:00
Steve Moyer
eea325e558 am 510fca8b: (-s ours) am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 
* commit '510fca8beb2113b38c943f17570d0248af356ac5':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
 2014-04-04 16:47:08 +00:00
Steve Moyer
510fca8beb am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 
* commit '20c4a33489f27fe704f6eb66ec49bc9063b59951':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
 2014-04-04 16:39:25 +00:00
Steve Moyer
20c4a33489 am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 
* commit '0b1a1f7b38f6fdfa4de35238529036d2a6230615':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
 2014-04-04 16:36:17 +00:00
Steve Moyer
0b1a1f7b38 Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 2014-04-04 16:32:00 +00:00
Xavier Ducrohet
e22286831f am 8821b239: am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools." 
* commit '8821b239d175f441c1631f9ce04f9b0109dd3a72':
  Move ZipAlign to build-tools.
 2014-04-04 03:26:31 +00:00
Xavier Ducrohet
8821b239d1 am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools." 
* commit 'd6ccbcd253d34feb75cba4cbd98f520dfa789757':
  Move ZipAlign to build-tools.
 2014-04-04 03:19:02 +00:00
Xavier Ducrohet
d6ccbcd253 am 47eadf1e: Merge "Move ZipAlign to build-tools." 
* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
  Move ZipAlign to build-tools.
 2014-04-04 00:08:23 +00:00
Steve Moyer
6ded79d696 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-04-03 16:02:56 -07:00
Xavier Ducrohet
47eadf1ece Merge "Move ZipAlign to build-tools." 2014-04-03 22:21:08 +00:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools. 
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
 2014-04-03 10:09:53 -07:00
The Android Automerger
02b82b721c merge in master-release history after reset to master 2014-04-02 05:49:35 -07:00
Andrew Hsieh
5cc87a392e am 1da473b4: am c415108e: am 497b94df: Merge "Headers update from bionic for x86_64 support" 
* commit '1da473b4cc22dc7121d5f07489bfc447d5bacc08':
  Headers update from bionic for x86_64 support
 2014-04-02 09:17:54 +00:00
Andrew Hsieh
1da473b4cc am c415108e: am 497b94df: Merge "Headers update from bionic for x86_64 support" 
* commit 'c415108e0e1eae28827db43ddacf987040a3b150':
  Headers update from bionic for x86_64 support
 2014-04-02 09:09:42 +00:00
Andrew Hsieh
c415108e0e am 497b94df: Merge "Headers update from bionic for x86_64 support" 
* commit '497b94df024cc6b4b6a5e98886dc85e8bc391994':
  Headers update from bionic for x86_64 support
 2014-04-02 09:01:43 +00:00
Andrew Hsieh
497b94df02 Merge "Headers update from bionic for x86_64 support" 2014-04-02 08:21:49 +00:00
The Android Automerger
7d8267f23e merge in master-release history after reset to master 2014-04-01 05:49:31 -07:00
Michael Wright
27854d34a5 am 26b91ca8: Add logging for failed injections to Monkey. 
* commit '26b91ca81c5a38f5bc52c33a85657df1a337aa19':
  Add logging for failed injections to Monkey.
 2014-04-01 00:14:23 +00:00
Michael Wright
26b91ca81c Add logging for failed injections to Monkey. 
Bug: 13679803
Change-Id: Iefb0073ad892b15b734b739fe036262ea60066d2
 2014-04-01 00:05:37 +00:00
Dave Platt
73f1ba806f Update sample NSD app to work reliably with current Android 
Change the management of NSD Listener objects to one which ensures
that each Listener will be used for only one NSD service request at
a time (as the APIs were intended to function).  Listeners are now
allocated in a "lazy" on-demand way, rather than having one Listener
of each type allocated at application startup time.  When the Register
or Discover button is clicked, any existing Listener request of that
type will be canceled and the Listener discarded (avoiding the need
to wait until the Listener callback has been completed), and a new
Listener will be allocated.

Moves code around in the application-lifecycle callbacks to reflect
the current Android lifecycle.  Doing important things like
unregistering NSD services should not be done in the onDestroy()
callback, as there is no guarantee that the app won't be killed
before this callback is invoked.  This can lead to "zombie"
NSD registrations in KitKat.

Adds additional lifecycle logging.

Pass 2 - fix typo, clean up trailing whitespace

Pass 3 - fix onStart/onRestart mismatch

Bug: 13512512
Change-Id: Ic164110759204b27d8a14376777b593ebe1865fa
 2014-03-31 13:45:36 -07:00
The Android Automerger
7fb212dcef merge in master-release history after reset to master 2014-03-29 05:49:36 -07:00
Andrew Hsieh
ac7d1f9f95 am 4e2c5f8a: am 2a87ef1a: am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits" 
* commit '4e2c5f8afa21f44127000c45b6ef8f95f1d08b31':
  Move _types.h to 32-bit arch dirs to avoid impact on 64-bits
 2014-03-29 03:30:15 +00:00
Andrew Hsieh
ec58d454f2 am 00f82e18: am 930e9fee: am ac982541: Merge "Refresh locale.h from bionic" 
* commit '00f82e18c6d393d57dc1440cbc3fe9b6652ed38a':
  Refresh locale.h from bionic
 2014-03-29 03:30:14 +00:00
Andrew Hsieh
6dd1de82c1 am 161289c3: am d64062a0: am 1782523e: Merge "Add 64-bit libc.so/libm.so/libdl.so" 
* commit '161289c3e28f4751bb229ee0d6fc9edb4dc8c0fe':
  Add 64-bit libc.so/libm.so/libdl.so
 2014-03-29 03:30:13 +00:00
Andrew Hsieh
4e2c5f8afa am 2a87ef1a: am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits" 
* commit '2a87ef1a90597ff231cf41e22009a048869b55e1':
  Move _types.h to 32-bit arch dirs to avoid impact on 64-bits
 2014-03-29 03:23:43 +00:00
Andrew Hsieh
00f82e18c6 am 930e9fee: am ac982541: Merge "Refresh locale.h from bionic" 
* commit '930e9feeda4f71c13735dc8441e553dfbc4aa4a1':
  Refresh locale.h from bionic
 2014-03-29 03:23:42 +00:00
Andrew Hsieh
161289c3e2 am d64062a0: am 1782523e: Merge "Add 64-bit libc.so/libm.so/libdl.so" 
* commit 'd64062a05fadc29576b5ef757edefd4099cfc9ca':
  Add 64-bit libc.so/libm.so/libdl.so
 2014-03-29 03:23:41 +00:00
Andrew Hsieh
2a87ef1a90 am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits" 
* commit '0123d3496ac20fadbedf3c0fa38447e66a0b8ff2':
  Move _types.h to 32-bit arch dirs to avoid impact on 64-bits
 2014-03-29 03:21:24 +00:00
Andrew Hsieh
930e9feeda am ac982541: Merge "Refresh locale.h from bionic" 
* commit 'ac982541a91fb9999b55a52ef0e269731968c231':
  Refresh locale.h from bionic
 2014-03-29 03:17:40 +00:00
Andrew Hsieh
d64062a05f am 1782523e: Merge "Add 64-bit libc.so/libm.so/libdl.so" 
* commit '1782523e75b76d2c67b807fc1520c61532a129a6':
  Add 64-bit libc.so/libm.so/libdl.so
 2014-03-29 03:17:38 +00:00
Andrew Hsieh
0123d3496a Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits" 2014-03-29 03:12:46 +00:00
Andrew Hsieh
ac982541a9 Merge "Refresh locale.h from bionic" 2014-03-29 03:07:31 +00:00
Andrew Hsieh
1782523e75 Merge "Add 64-bit libc.so/libm.so/libdl.so" 2014-03-29 03:05:27 +00:00
Yigit Boyar
c1ae5dfad9 am f8af676f: am 71e839fd: am 01851b3e: Merge "LinearLayoutManager examples" into klp-modular-dev 
* commit 'f8af676fe140074dd94b6db5bfd97ecc1c821d91':
  LinearLayoutManager examples
 2014-03-29 00:00:11 +00:00
Yigit Boyar
f8af676fe1 am 71e839fd: am 01851b3e: Merge "LinearLayoutManager examples" into klp-modular-dev 
* commit '71e839fdec5256af2ac9a55f6b32c929383e6dfe':
  LinearLayoutManager examples
 2014-03-28 23:40:10 +00:00
Yigit Boyar
71e839fdec am 01851b3e: Merge "LinearLayoutManager examples" into klp-modular-dev 
* commit '01851b3efd18fd60db8a13563e1374a84b3c89fe':
  LinearLayoutManager examples
 2014-03-28 23:03:53 +00:00
Yigit Boyar
01851b3efd Merge "LinearLayoutManager examples" into klp-modular-dev 2014-03-28 22:56:29 +00:00
Pavel Chupin
cd9dfd0ffd Refresh locale.h from bionic 
Change-Id: I2dfa05f13f6e6e92a5ca238504bd7ee7c511640c
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-03-28 16:55:51 +04:00
Yigit Boyar
7cbaf60e92 LinearLayoutManager examples 
Added a new activity to Support7Demos to showcase LinearLayoutManager.
Extracted helper classes from RecycleViewActivity so that they can be used in other examples.

Change-Id: Id00325afee00eefd259f688e65d6124e23d6eb83
 2014-03-27 15:51:53 -07:00
The Android Automerger
d35119c1af merge in master-release history after reset to master 2014-03-27 05:49:34 -07:00
Raphael Moll
26c0fc9196 am 7a058622: am 93421018: (-s ours) am de76aab8: am f03f35fe: Update support library version to 19.1.0. 
* commit '7a0586221fff6fdfca175e677a6c9d22e3f6a0c9':
  Update support library version to 19.1.0.
 2014-03-26 23:43:18 +00:00
Raphael Moll
7a0586221f am 93421018: (-s ours) am de76aab8: am f03f35fe: Update support library version to 19.1.0. 
* commit '9342101807f2d5af3e3f2303761b16c3a81aaa8f':
  Update support library version to 19.1.0.
 2014-03-26 22:22:36 +00:00
Alan Viverette
abd2383d3e am f210b1e3: Remove deprecated Gallery and ImageSwitcher from API Demos 
* commit 'f210b1e37f3a1158964e588cb9cb586d636c75d1':
  Remove deprecated Gallery and ImageSwitcher from API Demos
 2014-03-26 21:19:19 +00:00
Alan Viverette
4794b17a54 am f37ac856: Clean up DeviceDefault style in API Demos 
* commit 'f37ac8560aa6b90813df0aa0f4587d25b388dd06':
  Clean up DeviceDefault style in API Demos
 2014-03-26 21:19:18 +00:00
Alan Viverette
f210b1e37f Remove deprecated Gallery and ImageSwitcher from API Demos 
Change-Id: Ib6b1f23a368d042674aabd01361f76df2a8e5280
 2014-03-26 14:13:36 -07:00
Raphael Moll
9342101807 am de76aab8: am f03f35fe: Update support library version to 19.1.0. 
* commit 'de76aab81370f202e2de34da71f2bcd0764548e7':
  Update support library version to 19.1.0.
 2014-03-26 20:17:03 +00:00
Raphael Moll
de76aab813 am f03f35fe: Update support library version to 19.1.0. 
* commit 'f03f35fe248d4cf9ead29251d793f65f9f9f4c55':
  Update support library version to 19.1.0.
 2014-03-26 20:11:45 +00:00
Raphael Moll
f03f35fe24 Update support library version to 19.1.0. 
Change-Id: Ia6d64b03c7bd9f4faaa59551c15e451b9ad297cd
 2014-03-26 20:01:30 +00:00
Alan Viverette
f37ac8560a Clean up DeviceDefault style in API Demos 
Change-Id: I00b638cb99ef55accfc900758b8445765c8e6d69
 2014-03-26 12:23:07 -07:00
Xavier Ducrohet
7db1d2bd7f am 6ee68fe3: am 6e211383: am 459fdbce: am dcb2c538: Add annotation support lib to SDK. 
* commit '6ee68fe3433d3b51a42cd4b526c880f17527ce2c':
  Add annotation support lib to SDK.
 2014-03-26 11:29:13 -07:00