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

163291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chenjie Luo
76ed803fbd Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 2014-10-16 20:57:56 +00:00
Andrew Solovay
347257a74d docs: Restored the preview license. 
Added the preview license back, with changes as previously negotiated
with legal.

See first comment for staging directory link.

Change-Id: Ibc23d4d89b4380546d61ed052ba15dc81b8b1336
 2014-10-16 13:57:20 -07:00
Christopher Tate
a28b5c5160 Eliminate race condition around backup completion + resumption 
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state.  Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.

Bug 17931760

Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
 2014-10-16 13:56:45 -07:00
Rich Slogar
fbe9a6affc am 18535b07: am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '18535b07a8a8e244f89ccce8c07226c24055c748':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:55:03 +00:00
Rich Slogar
18535b07a8 am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '68c537f1981970f0ccac0fe46d5c522d5e05a82c':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:49:53 +00:00
Rich Slogar
68c537f198 am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '60e74b4924dee6d033ca61854cac42768006ced5':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:45:31 +00:00
Rich Slogar
60e74b4924 Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 2014-10-16 20:41:18 +00:00
Chenjie Luo
bda26b3b01 am e1d07b9e: am 50fcdf9d: am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 
* commit 'e1d07b9eba96c420261969a01e59968f0a423bfe':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
 2014-10-16 20:37:29 +00:00
Chenjie Luo
2cab8825b3 Add system property config.disable_networktime to configure NetworkTimeUpdateService 
Bug: 17934875
Change-Id: Ie5acf7266a5766f407db8f23d2c3d26920fa4020
 2014-10-16 13:33:25 -07:00
Chenjie Luo
e1d07b9eba am 50fcdf9d: am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 
* commit '50fcdf9d46e3029428e00a6a0083e5395ed029f1':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
 2014-10-16 20:32:06 +00:00
Chenjie Luo
50fcdf9d46 am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 
* commit 'fe09db1e0d5af46e7b643c37ba52f62500b7f043':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
 2014-10-16 20:28:02 +00:00
Chenjie Luo
fe09db1e0d Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 2014-10-16 20:23:10 +00:00
Chenjie Luo
d25e4efdc1 Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" 
This reverts commit c597c55ffeb9debcf2dba8a77a80caa9016ea4d1.

Change-Id: Idc83e582c10dda2c6245ec19921785f361a07a68
 2014-10-16 20:22:24 +00:00
Svet Ganov
eec22a1c24 am 216d08ff: am 0ee1d87c: am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit '216d08ffd548d056101af14af4634f4d796cec51':
  Send accessibility events with no window.
 2014-10-16 19:56:04 +00:00
Svet Ganov
216d08ffd5 am 0ee1d87c: am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit '0ee1d87c38344979a273e1a2c7f68f8d075f3ccc':
  Send accessibility events with no window.
 2014-10-16 19:51:44 +00:00
Svet Ganov
0ee1d87c38 am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit '515f14d4659626ebf8381a5cc2d6a44063d30b42':
  Send accessibility events with no window.
 2014-10-16 19:47:27 +00:00
Svet Ganov
515f14d465 am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit 'b22552c35bc939619c2e7c967e4eae618d8b93cc':
  Send accessibility events with no window.
 2014-10-16 19:40:15 +00:00
Svet Ganov
b22552c35b Merge "Send accessibility events with no window." into lmp-dev 2014-10-16 19:35:41 +00:00
Greg Hackmann
9b1ffd36a1 am 7b47fb76: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '7b47fb7679c781c3f6986c92bdae76185c94b434':
 2014-10-16 19:17:18 +00:00
Chenjie Luo
0db099ca30 am 591485df: am e43110ac: am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit '591485df659a3c804945da265dcee63fd8b64d8a':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
 2014-10-16 19:17:12 +00:00
Scott Rowe
6b7bca2cbb am d534cf04: am 0e328222: am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'd534cf04f014096e23fa533614a25eafeaafb771':
  docs: update reference to FragmentRetainInstance
 2014-10-16 19:17:06 +00:00
Joe Fernandez
b3b530165b am 3ecfba13: am ebdafcbd: am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '3ecfba13c015c3dd2c76bde99c4e639cfb7d3584':
  Typo fixed in sample code
 2014-10-16 19:17:00 +00:00
David Friedman
749adf66d0 am 97e21e85: am f8e428dd: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit '97e21e85bd99542ebe7b9083958db516286b9b82':
 2014-10-16 19:16:55 +00:00
David Friedman
bc6c216540 am 57c63dbf: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev automerge: f8e428d 
* commit '57c63dbf271ebc66c9ce09eaac05b1d1f524944e':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 19:16:25 +00:00
Rich Slogar
9d2a9772e9 am 436d4df6: am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev automerge: 6b1edcd 
* commit '436d4df6433e444fa08ec8258f48187e67018dda':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 19:16:20 +00:00
Andrew Solovay
917a861766 am 3b278f61: am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev automerge: 11014fe 
* commit '3b278f61fb8f52e7601759081f293c7c9b7e1266':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 19:16:15 +00:00
Greg Hackmann
7b47fb7679 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2014-10-16 19:12:00 +00:00
Chenjie Luo
591485df65 am e43110ac: am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit 'e43110ac8444fff3ac63b30f51e2b785c12b0829':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
 2014-10-16 19:11:14 +00:00
Scott Rowe
d534cf04f0 am 0e328222: am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit '0e3282223921623be7c1c5a158ab30785e1bd565':
  docs: update reference to FragmentRetainInstance
 2014-10-16 19:11:09 +00:00
Joe Fernandez
3ecfba13c0 am ebdafcbd: am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit 'ebdafcbd1614b250edd5f5840b4e8e007f016bbf':
  Typo fixed in sample code
 2014-10-16 19:11:04 +00:00
David Friedman
97e21e85bd am f8e428dd: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit 'f8e428dd68279a662b310905798479f5fea85c0f':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 19:10:59 +00:00
David Friedman
57c63dbf27 am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
automerge: f8e428d

* commit 'f8e428dd68279a662b310905798479f5fea85c0f':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 19:10:44 +00:00
Rich Slogar
436d4df643 am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 
automerge: 6b1edcd

* commit '6b1edcd0c852a6365ad3ddc802b8e94b2da99606':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 19:09:38 +00:00
Andrew Solovay
3b278f61fb am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 
automerge: 11014fe

* commit '11014feaed47ef28c0f7782463f99d181261774a':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 19:08:37 +00:00
Rich Slogar
8ee2b2dace :docs Platform Tools Rel Note Nexus 6/9 dpi updates 
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
 2014-10-16 12:07:35 -07:00
Chenjie Luo
e43110ac84 am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit '8fac66821cc12104999bb87c900abff659160a44':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
 2014-10-16 19:01:30 +00:00
Scott Rowe
0e32822239 am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'c9f6bb8e3675461268e9543369ff39d8dd465da5':
  docs: update reference to FragmentRetainInstance
 2014-10-16 19:01:26 +00:00
Joe Fernandez
ebdafcbd16 am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '518a54aed60878329e5e5492f10820108a056d6a':
  Typo fixed in sample code
 2014-10-16 19:01:22 +00:00
David Friedman
f8e428dd68 am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit 'b0683f0c3f5eedb332a66203e4850f60eb83dcc5':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 19:00:16 +00:00
Rich Slogar
6b1edcd0c8 am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 
* commit '349e3640b784c277f983ec9c849db3131d135ccf':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 19:00:03 +00:00
Andrew Solovay
11014feaed am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 
* commit '0b7e1bafe5e722bd8c620f8d404e39a2c37d893c':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 18:59:59 +00:00
Scott Rowe
8a1faa9c3d am f1b9b1f9: am f83c56cd: am a3bc95c5: am 8f93624e: docs: delete preview pages 
* commit 'f1b9b1f9927b8ea009a449045020fdac48cf3610':
  docs: delete preview pages
 2014-10-16 18:45:33 +00:00
Prerepa Viswanadham
1724f21160 am 2e8beaed: am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '2e8beaed54aa897eb4b9435ab11d269f15266f4a':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:45:28 +00:00
Lorenzo Colitti
0afed57e60 am dc14068a: am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'dc14068a7df03b996de2054cf0579d506331caaa':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 18:45:23 +00:00
Lorenzo Colitti
5b72efd078 am b7ba3e21: am 94dbc64c: am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit 'b7ba3e21e2a92ce8778045b6fe8b1cddc477215a':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 18:45:18 +00:00
Lorenzo Colitti
80f8c02eb2 am 03c0c785: am 5fa2929f: am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '03c0c78575c59bb33ca4b5eb1eb20ddf886efa11':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 18:45:13 +00:00
Chenjie Luo
8fac66821c Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev 2014-10-16 18:45:08 +00:00
Christopher Tate
c49b6b4b20 am d1ec1c47: am 31e4eeb2: am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit 'd1ec1c47154b96cd123219615480809ce0072b69':
  Fix spurious restore session timeouts
 2014-10-16 18:45:08 +00:00
Scott Rowe
c9f6bb8e36 am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit '447369f2d2b02f78d01d4a4923fedfca96c1950f':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:42:20 +00:00
Joe Fernandez
518a54aed6 am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '7e19b402c6651112a56ab8569ea53a7004a3a552':
  Typo fixed in sample code
 2014-10-16 18:42:16 +00:00