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

155368 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
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
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
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
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
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
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
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
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
Scott Rowe
f83c56cd42 am a3bc95c5: am 8f93624e: docs: delete preview pages 
* commit 'a3bc95c50638b869a4d9aa8b0fefb6862b8cdc05':
  docs: delete preview pages
 2014-10-16 18:35:40 +00:00
Prerepa Viswanadham
06819409c6 am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:35:33 +00:00
Lorenzo Colitti
e526668eae am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'd04d6c91a311af7a52f05fac5935c9327a990046':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 18:35:21 +00:00
Lorenzo Colitti
94dbc64c98 am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit 'ffd7335088d228ac0c56fdc7e2faba79c78572bf':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 18:35:18 +00:00
Lorenzo Colitti
5fa2929f16 am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '24f9a26cea200d9452bd922d94f8669d87744f53':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 18:35:14 +00:00
Christopher Tate
31e4eeb26f am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit 'ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
  Fix spurious restore session timeouts
 2014-10-16 18:34:56 +00:00
Scott Rowe
447369f2d2 am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:23:42 +00:00
Joe Fernandez
7e19b402c6 am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-16 18:23:18 +00:00
David Friedman
b0683f0c3f am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit 'd12e6de645a39e6e902785d544100fb1963aa203':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 18:10:36 +00:00
David Friedman
d12e6de645 Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 2014-10-16 18:06:01 +00:00
Quddus Chong
49cc89ec51 docs: Updates to Android 5.0 API Overview. 
Change-Id: I0dcbb134fc499da0172bfe8d79c5aaa1a4b3ef75
 2014-10-16 11:01:42 -07:00
Geoff Mendal
c218d8f198 am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '00e4d7830cc7834efdcec2a35d130cbc89e16551':
  Import translations. DO NOT MERGE
 2014-10-16 17:45:58 +00:00
Brian Carlstrom
6580c273a5 am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:45:54 +00:00
Geoff Mendal
551deffb76 am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'fb0356852dad1daeb673cdf117193a8421f66aaa':
  Import translations. DO NOT MERGE
 2014-10-16 17:45:45 +00:00
Marco Nelissen
a2d77ed7d7 am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
  Also consider secondary storage when verifying paths
 2014-10-16 17:45:36 +00:00
Dirk Dougherty
7e4a3aecbd am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit '0cd670b39be13e1840927694b36d6c61e5c7c1dd':
  Doc change: Add diffs for API level 21.
 2014-10-16 17:45:31 +00:00
Svet Ganov
d5b0842a1d Send accessibility events with no window. 
An app can send an accessibility event by calling the send methods
on view or directly asking the accessibility manager to do that.
While the recommened way to send such events is calling the methods
on view a legacy app or app whose developer did not read the docs
carefully may be calling the accessibility manager APIs directly.
In such a case the event does not have assigned window id and does
not get send. Since events fired by using the accessibility manager
directly lack context to determine whether thier source is important
for accessibility we assume they come from an important view to
avoid breaking backwards compatibility.

bug:18001711

Change-Id: Ie1c298fa5a0670cbeaedfcd64f820961c296b6ca
 2014-10-16 17:31:52 +00:00
Andrew Solovay
6f6d10e744 docs: Updating support library pages for v.21. 
For doc stage location, see my comment of Oct 13 3:47 PM.

Change-Id: I4da98448cd95451c82b4e8198dcd95edf64398b8
 2014-10-16 10:31: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
a1e3063ebe am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'ab64919c0e683dcd0f32f95f580f0d95ce29476d':
  docs: update reference to FragmentRetainInstance
 2014-10-16 17:01:04 +00:00
Scott Rowe
ab64919c0e Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 2014-10-16 16:56:55 +00:00
Scott Rowe
a3bc95c506 am 8f93624e: docs: delete preview pages 
* commit '8f93624eafd3518d97c88506bbb9a93c81eb7f03':
  docs: delete preview pages
 2014-10-16 16:44:30 +00:00