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

154033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chenjie Luo
c597c55ffe Add system property config.disable_timeupdate to configure NetworkTimeUpdateService 
Bug: 17934875
Change-Id: Ic1acff13190f38cedb1ecf22783d4dfd3373511d
 2014-10-16 11:36:31 -07:00
Rich Slogar
349e3640b7 am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 
* commit '70807ab128c544b972f3710e53eeedd0d40dce2a':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 17:15:23 +00:00
Rich Slogar
70807ab128 Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 2014-10-16 17:10:49 +00:00
Andrew Solovay
0b7e1bafe5 am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 
* commit '34ef4ff9b7a3625477b0eccd20db15129f2732f3':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 17:08:33 +00:00
Andrew Solovay
34ef4ff9b7 Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 2014-10-16 17:03:02 +00:00
Rich Slogar
54444f66a4 docs:Build and Platform Tools Updates for Android 5 
Change-Id: Ib7adf35c302d24a1c2394a89b3a04ca8d77cd296
 2014-10-16 10:02:22 -07:00
Scott Rowe
a3bc95c506 am 8f93624e: docs: delete preview pages 
* commit '8f93624eafd3518d97c88506bbb9a93c81eb7f03':
  docs: delete preview pages
 2014-10-16 16:44:30 +00:00
Scott Rowe
8f93624eaf docs: delete preview pages 
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
 2014-10-16 09:39:04 -07:00
Prerepa Viswanadham
56302744c4 am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 16:11:26 +00:00
Prerepa Viswanadham
248edc3e96 Update javadoc comments for getBluetoothLeAdvertiser() 
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities

bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
 2014-10-16 16:06:44 +00:00
Lorenzo Colitti
d04d6c91a3 am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'b7d8514822aefbf8274f5464dc12cee151e2b78b':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 09:23:24 +00:00
Lorenzo Colitti
ffd7335088 am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit '917c547beb9adecf2e7d2b355e85e37c2557c5d3':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 09:23:21 +00:00
Lorenzo Colitti
24f9a26cea am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 09:23:17 +00:00
Lorenzo Colitti
b7d8514822 Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 2014-10-16 08:46:10 +00:00
Lorenzo Colitti
917c547beb Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev 2014-10-16 08:45:03 +00:00
Lorenzo Colitti
28dcf0345b Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 2014-10-16 08:37:28 +00:00
Christopher Tate
ce39d25f2c am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit '185fcadf898f0fe41461a632177dfd0d7e5dfb70':
  Fix spurious restore session timeouts
 2014-10-16 03:36:34 +00:00
Christopher Tate
185fcadf89 Merge "Fix spurious restore session timeouts" into lmp-dev 2014-10-16 03:29:00 +00:00
Geoff Mendal
00e4d7830c am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c71a7b3cb8eb1565c01caaf231773759ee63b4cf':
  Import translations. DO NOT MERGE
 2014-10-16 01:56:04 +00:00
Brian Carlstrom
d2b824887f am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit '20de619d66a594fd9e6e76a3a2cb79422aef577c':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 01:56:00 +00:00
Geoff Mendal
fb0356852d Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-16 01:48:42 +00:00
Geoff Mendal
ed8fee2e6f Import translations. DO NOT MERGE 
Change-Id: I3cf464b7c94c35965e627353765c4ef649c2a209
Auto-generated-cl: translation import
 2014-10-15 18:47:17 -07:00
Geoff Mendal
c71a7b3cb8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-16 01:35:18 +00:00
Geoff Mendal
874633e378 Import translations. DO NOT MERGE 
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
 2014-10-15 18:34:07 -07:00
Christopher Tate
0f32717a17 Fix spurious restore session timeouts 
The restore-session idle timeout should not be ticking while we're
doing legitimate restore work.  We now explicitly stop the timeout
ticker [a delayed message on our handler thread] whenever we undertake
a valid restore operation.  The timer is already correctly resumed
when restore operations conclude.

(In practice we need to suspend the timeout tracking at exactly those
times when we're entering the wakelock-protected restore flow.  The
timeout is reestablished when the wakelock is released; this part
is already in the code.)

Bug 17990544

Change-Id: I7318020ce30fd9c35bc3a644f8c101fd3d063c8b
 2014-10-16 01:34:01 +00:00
Brian Carlstrom
20de619d66 Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 2014-10-16 01:01:26 +00:00
Marco Nelissen
4683a10f9c am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e':
  Also consider secondary storage when verifying paths
 2014-10-16 00:41:10 +00:00
Marco Nelissen
36c931b31a Merge "Also consider secondary storage when verifying paths" into lmp-dev 2014-10-16 00:38:03 +00:00
Dirk Dougherty
0cd670b39b am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit 'a0b3796d937dff83b5dd94e8f091a36bc9b304dd':
  Doc change: Add diffs for API level 21.
 2014-10-16 00:23:49 +00:00
Dirk Dougherty
a0b3796d93 Merge "Doc change: Add diffs for API level 21." into lmp-dev 2014-10-16 00:20:02 +00:00
Quddus Chong
073c80d346 am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '0a276b9448d907822bee1c3009608694fc480fcc':
  docs: Added L API overview.
 2014-10-15 23:41:23 +00:00
Dirk Dougherty
41d5d14df2 am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '8ca0f84ea3c6f17e7d0121a87197bfd25f9becfa':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-15 23:41:13 +00:00
Geoff Mendal
e134ac1cec am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e2a1f1cd885ae73fc165f0623697b94668e01c86':
  Import translations. DO NOT MERGE
 2014-10-15 23:41:05 +00:00
Craig Mautner
d1a58c45fe am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '5d460b88715c8a902eb3930e690ddd1b8d84338f':
  Remove unnecessary logging.
 2014-10-15 23:40:54 +00:00
Eric Rowe
de96b966fb am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit '1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-15 23:40:40 +00:00
Craig Mautner
87441860bf am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit 'e52791055c855a957cad767dfa9889faae86660c':
  Move desired task to top if not already there.
 2014-10-15 23:40:11 +00:00
John Spurlock
3d4aec1bb7 am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'b2344c81bcf49129d303a2919cfffd7a720c261b':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-15 23:40:07 +00:00
Evan Charlton
e8a700e9f7 am 843e2343: Add WindowManager.aidl to AIDL list 
* commit '843e234318421b320e74bb2d09c3b436d82ee127':
  Add WindowManager.aidl to AIDL list
 2014-10-15 23:39:57 +00:00
RoboErik
0dfd86e006 am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata
 2014-10-15 23:39:29 +00:00
Quddus Chong
0a276b9448 Merge "docs: Added L API overview." into lmp-dev 2014-10-15 23:26:43 +00:00
Tom Taylor
522fe28e3d am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 
* commit '6d4f4575463ef5fdcdfbf3118a893ecbdb14a02b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 23:15:26 +00:00
Prashant Malani
0227cebcb2 am c64522fb: am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit 'c64522fb2e1893c21b1b1cc9051a3d1013c5d987':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 23:14:27 +00:00
Ricardo Cervera
e0cf20b505 am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '7e50d9706cd0d7cd5c58c976fd582c81478a975c':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 23:14:24 +00:00
Luan Nguyen
faea1ffab2 am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'bff5c1932c6bdd2a777b4236f9f1d562a53029fb':
  docs: Android Wear Design fixes
 2014-10-15 23:14:17 +00:00
smain@google.com
fcebd6c320 am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'b3994c2e58c7cebef8274ff6d801819a2b189183':
  add the butterbar for L announce to Preview landing page
 2014-10-15 23:14:12 +00:00
smain@google.com
24ff6491f1 am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '2912627e007b95cf4b16c9e52a3acbec0c8bae60':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 23:14:07 +00:00
Dirk Dougherty
8ca0f84ea3 Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 2014-10-15 22:40:19 +00:00
Geoff Mendal
7b5d78f890 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-15 22:38:39 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths 
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
 2014-10-15 15:36:50 -07:00
Geoff Mendal
90a1bd0769 Import translations. DO NOT MERGE 
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
 2014-10-15 15:19:49 -07:00