drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,687 Commits 1 Branch 0 Tags
Commit Graph

174687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Gilmore
2b36779f30 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit '99b91b2fd28888b20511316cb6f81b510b05cdf5':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:56:51 +00:00
Eric Gilmore
99b91b2fd2 am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit 'c9dbaf0483b0274879164806297180d260689f1f':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:45:47 +00:00
John Spurlock
79448424c3 am 43c7741c: Doze: pulse less often. automerge: 618e420 
* commit '43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
  Doze: pulse less often.
 2015-02-10 17:40:40 +00:00
John Spurlock
90fc289102 Doze: pulse less often. automerge: 618e420 
automerge: 43c7741

* commit '43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
  Doze: pulse less often.
 2015-02-10 17:40:33 +00:00
Luan Nguyen
c25adda636 docs: Fix various issues with incorrect code samples. 
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
 2015-02-10 09:39:44 -08:00
John Spurlock
43c7741c28 Doze: pulse less often. 
automerge: 618e420

* commit '618e420adf2ab2478f62891738320bb9cc5260ec':
  Doze: pulse less often.
 2015-02-10 17:32:27 +00:00
Calin Juravle
16df82d7ac am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." 
automerge: d1e074a

* commit 'd1e074a72452c909c7ed2a4baf220d9d2f306b20':
  Get the instruction set that the libraries of secondary Abi is supported.
 2015-02-10 16:23:51 +00:00
Calin Juravle
d1e074a724 am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." 
* commit 'fd523efcde98e97cd8c088f95198e6e13f4f8b64':
  Get the instruction set that the libraries of secondary Abi is supported.
 2015-02-10 16:18:27 +00:00
Calin Juravle
fd523efcde Merge "Get the instruction set that the libraries of secondary Abi is supported." 2015-02-10 16:13:30 +00:00
John Spurlock
618e420adf Doze: pulse less often. 
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.

Bug: 19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
 2015-02-10 09:23:29 -05:00
Chris Warrington
de3ab0a9e8 Fix AAPT daemon mode with paths containg spaces. 
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423

Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
 2015-02-09 21:20:52 -08:00
Svetoslav
c052b0efce am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit 'cf2c8545bd6a8888801fa8c04d263879602eeb36':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 03:09:20 +00:00
Svetoslav
cf2c8545bd am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit '5521f39ff75d2af909061581e27810afaa9ed242':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 03:01:50 +00:00
Svetoslav
5521f39ff7 am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit 'c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 02:51:30 +00:00
Svetoslav
c73cfa0ffb Accessibiltiy: missed update to the previous patch. 
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
 2015-02-09 18:33:07 -08:00
Jason Sams
ec10f833b4 am 2a3cdf57: Merge "Implement array types" 
automerge: 6e0ad25

* commit '6e0ad25ca8def88a48c9cc6436b12da7ff4600c2':
  Implement array types
 2015-02-10 01:44:11 +00:00
Neil Fuller
04bd52d77c am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" 
automerge: 86b9cc3

* commit '86b9cc30099cf0836484a5231686cb1d85ebfdca':
  Avoid static initialization of Layout from TextUtils
 2015-02-10 01:42:41 +00:00
Elliott Hughes
aa122241fa am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'." 
automerge: da1bd4c

* commit 'da1bd4c01abf9ec3aa5a0d9717a60935304068c4':
  Remove obsolete 'numeric_date_template'.
 2015-02-10 01:40:59 +00:00
Baligh Uddin
a314754575 am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit '2083173af997419fbc2e92627fe5500f91ac7e5b':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:25:54 +00:00
Baligh Uddin
2083173af9 am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit 'fbf9666f846284ee1d4d09e2d36f0d2b92120656':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:17:42 +00:00
Eric Gilmore
c9dbaf0483 Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 2015-02-10 01:13:03 +00:00
Baligh Uddin
fbf9666f84 am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit 'b2ba6dfc7b33ec9e58d9f556206440a26069e264':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:07:08 +00:00
Baligh Uddin
b2ba6dfc7b Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 2015-02-10 00:57:21 +00:00
Andre Eisenbach
cd62341645 am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '8f31fa81e0a79f51ceb301193a2c77ca7f619769':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:42:55 +00:00
Andre Eisenbach
8f31fa81e0 am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:34:43 +00:00
kmccormick
0137175af9 Doc change: refactor GCM docs to be platform-agnostic. 
Fix for:

b/17733410

Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
 2015-02-09 16:28:15 -08:00
Andre Eisenbach
3ca77ccf87 am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:26:51 +00:00
Andre Eisenbach
455502b750 Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 2015-02-10 00:21:43 +00:00
Jason Sams
6e0ad25ca8 am 2a3cdf57: Merge "Implement array types" 
* commit '2a3cdf57a47140dfa17114338f83e0bb90054ed1':
  Implement array types
 2015-02-09 23:07:36 +00:00
Jason Sams
2a3cdf57a4 Merge "Implement array types" 2015-02-09 22:58:13 +00:00
Matthew Xie
a96869fc13 am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit '24c02c418673a18a287ce0820f0024f7a18ff181':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 22:14:10 +00:00
Matthew Xie
24c02c4186 am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit 'd67aff686d467c439970aef4a57a29838bf005c2':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 22:07:50 +00:00
Matthew Xie
d67aff686d am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit 'a63ba4287e5c87f41cd7d4b43111fd18f3ec499b':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 21:59:13 +00:00
Matthew Xie
a63ba4287e Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 2015-02-09 21:50:58 +00:00
Daniel Sandler
9337e595c1 am be62a5db: am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 
* commit 'be62a5db60adc738e7f5bbe24c04260e7b9b0a4f':
  Added TEXT_CHANGED event to PasswordTextView
 2015-02-09 21:04:25 +00:00
Daniel Sandler
be62a5db60 am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 
* commit '96ac73c357a55cada4f22d9a0a4a406c0cb624d2':
  Added TEXT_CHANGED event to PasswordTextView
 2015-02-09 20:55:51 +00:00
Daniel Sandler
96ac73c357 am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 
* commit '6e3de6a19af1533a0661975b5440b7c922211d0a':
  Added TEXT_CHANGED event to PasswordTextView
 2015-02-09 20:49:43 +00:00
Daniel Sandler
6e3de6a19a Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 2015-02-09 20:43:38 +00:00
Amith Yamasani
2b865d7e16 am a6318cd7: am d09878c1: am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev 
* commit 'a6318cd7f29c87bce2dfe9b74ff4a89c945be591':
  Limit cache update to packages that have changed
 2015-02-09 20:41:55 +00:00
Amith Yamasani
a6318cd7f2 am d09878c1: am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev 
* commit 'd09878c13c392b81633f4f748a85718cebd9f325':
  Limit cache update to packages that have changed
 2015-02-09 20:29:39 +00:00
Amith Yamasani
d09878c13c am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev 
* commit '61333d1b51ae36c9e5b1f4ea95bd00731c5e991a':
  Limit cache update to packages that have changed
 2015-02-09 20:05:32 +00:00
Amith Yamasani
61333d1b51 Merge "Limit cache update to packages that have changed" into lmp-mr1-dev 2015-02-09 19:59:27 +00:00
Rubin Xu
df890b4df0 am 082f0bf3: am df608e39: am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev 
* commit '082f0bf3bd0f266f776f4b28c3fb8dc917cd0d63':
  Perform post installation operations directly if backup manager is disabled
 2015-02-09 19:49:04 +00:00
Rubin Xu
082f0bf3bd am df608e39: am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev 
* commit 'df608e39b35e37490f8752b0902d9894f8d8940b':
  Perform post installation operations directly if backup manager is disabled
 2015-02-09 19:41:19 +00:00
Rubin Xu
df608e39b3 am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev 
* commit '3d521c0a0165dfef53e3c9d3d562bc0ec45405a8':
  Perform post installation operations directly if backup manager is disabled
 2015-02-09 19:33:19 +00:00
Andre Eisenbach
2b8696e3a9 Add API to check if a Bluetooth connection is encrypted (1/2) 
Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
 2015-02-09 11:31:06 -08:00
Rubin Xu
3d521c0a01 Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev 2015-02-09 19:25:20 +00:00
Amith Yamasani
460a7b4619 Limit cache update to packages that have changed 
When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.

Bug: 19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
 2015-02-09 11:10:31 -08:00
Neil Fuller
86b9cc3009 am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" 
* commit '37e5a941edb0ac5db6a4a4690827fa113c5443b1':
  Avoid static initialization of Layout from TextUtils
 2015-02-09 17:35:00 +00:00
Neil Fuller
37e5a941ed Merge "Avoid static initialization of Layout from TextUtils" 2015-02-09 17:29:59 +00:00