OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
Michael Wright [Mon, 23 Mar 2015 15:55:53 +0000 (15:55 +0000)]
am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"

* commit '978cfc39a10e1b95f9d6dfb5c8e9eb58a10ce0ec':
  SystemUI needs the SET_WALLPAPER permission

9 years agoMerge "SystemUI needs the SET_WALLPAPER permission"
Michael Wright [Mon, 23 Mar 2015 15:43:23 +0000 (15:43 +0000)]
Merge "SystemUI needs the SET_WALLPAPER permission"

9 years agoSystemUI needs the SET_WALLPAPER permission
Samuel Asteberg [Wed, 25 Feb 2015 14:51:05 +0000 (15:51 +0100)]
SystemUI needs the SET_WALLPAPER permission

If changing wallpaper when low on memory, retrieving the default
wallpaper may return null, which triggers error handling in
ImageWallpaper. This error handling tries to perform
WallpaperManager.clear(), but for that it needs SET_WALLPAPER
permission, which it does not have.

For users with apps that auto change wallpaper, this issue can
be frequent in low-memory conditions.

The solution is to add the permisson.

Change-Id: I81503c1667e3952c2dd15599969f7dcc51623e5b

9 years agoam eded9424: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:49:39 +0000 (12:49 +0000)]
am eded9424: (-s ours) Import translations. DO NOT MERGE

* commit 'eded9424305cb6538cc0516670930a9f8fccbfd1':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:38:24 +0000 (05:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I911df3cb6476017bb6723403dbabb2dfbfc4bce2
Auto-generated-cl: translation import

9 years agoam 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1...
Griff Hazen [Sun, 22 Mar 2015 00:05:48 +0000 (00:05 +0000)]
am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev

* commit '0b42ff7916e6cc32c812a3be8f3e4ebdf96e8553':
  Allow emulator to select a window outset bottom

9 years agoMerge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
Griff Hazen [Sat, 21 Mar 2015 23:59:45 +0000 (23:59 +0000)]
Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev

9 years agoam 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
Alan Viverette [Sat, 21 Mar 2015 20:20:48 +0000 (20:20 +0000)]
am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"

* commit '38fcaf4037a50225b931551a48c898c7b0bb4db2':
  Move arrow_pointer hotspot to better match actual tip

9 years agoMerge "Move arrow_pointer hotspot to better match actual tip"
Alan Viverette [Sat, 21 Mar 2015 20:06:56 +0000 (20:06 +0000)]
Merge "Move arrow_pointer hotspot to better match actual tip"

9 years agoam 31cee318: Merge "Specify public exponent for RSA"
Chad Brubaker [Sat, 21 Mar 2015 19:31:22 +0000 (19:31 +0000)]
am 31cee318: Merge "Specify public exponent for RSA"

* commit '31cee318f0494e6d77fc55599f285f534435405e':
  Specify public exponent for RSA

9 years agoMerge "Specify public exponent for RSA"
Chad Brubaker [Sat, 21 Mar 2015 19:18:23 +0000 (19:18 +0000)]
Merge "Specify public exponent for RSA"

9 years agoam 1f9bad3c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 15:34:55 +0000 (15:34 +0000)]
am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE

* commit '1f9bad3cb98964aaaecc2266102348b85d6fae9a':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 06:15:45 +0000 (23:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: I59ad105e99dbd4c8bd19c4e94eecd6e19425345a
Auto-generated-cl: translation import

9 years agoam 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 20 Mar 2015 22:35:41 +0000 (22:35 +0000)]
am 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

* commit '619ce1ce534775ab0ff4d591a69dafd53c04a315':
  Disable more hotkeys while in setup.

9 years agoam d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 20 Mar 2015 22:10:54 +0000 (22:10 +0000)]
am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.

9 years agoMerge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 20 Mar 2015 22:05:06 +0000 (22:05 +0000)]
Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

9 years agoSpecify public exponent for RSA
Chad Brubaker [Fri, 20 Mar 2015 21:03:49 +0000 (14:03 -0700)]
Specify public exponent for RSA

Keymaster no longer adds a default value, so these tests were failing.

Change-Id: I9c5a8d2552534db1d7fa77965b0d675acc3ccc0a

9 years agoDisable more hotkeys while in setup.
Jeff Brown [Fri, 20 Mar 2015 01:26:30 +0000 (18:26 -0700)]
Disable more hotkeys while in setup.

Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0

9 years agoam a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
Alex Klyubin [Fri, 20 Mar 2015 18:08:30 +0000 (18:08 +0000)]
am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."

* commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878':
  Add android.security.NetworkSecurityPolicy.

9 years agoMerge "Add android.security.NetworkSecurityPolicy."
Alex Klyubin [Fri, 20 Mar 2015 17:56:25 +0000 (17:56 +0000)]
Merge "Add android.security.NetworkSecurityPolicy."

9 years agoam 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in...
Zach Riggle [Thu, 19 Mar 2015 23:42:58 +0000 (23:42 +0000)]
am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '104a29b6b5fe6e454787053ca72950dbbc4d424b':
  Fix NPE in FlashlightController

9 years agoam a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightContr...
Zach Riggle [Thu, 19 Mar 2015 23:35:20 +0000 (23:35 +0000)]
am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
  Fix NPE in FlashlightController

9 years agoam d3e6428a: Merge "New API methods for Script Group"
Yang Ni [Thu, 19 Mar 2015 23:35:14 +0000 (23:35 +0000)]
am d3e6428a: Merge "New API methods for Script Group"

* commit 'd3e6428aea34ce3297123c63b4dd6223dac5d5a8':
  New API methods for Script Group

9 years agoam 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into...
Zach Riggle [Thu, 19 Mar 2015 23:29:06 +0000 (23:29 +0000)]
am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController

9 years agoam a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:22:10 +0000 (23:22 +0000)]
am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController

9 years agoMerge "New API methods for Script Group"
Yang Ni [Thu, 19 Mar 2015 23:21:27 +0000 (23:21 +0000)]
Merge "New API methods for Script Group"

9 years agoam 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:15:02 +0000 (23:15 +0000)]
am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController

9 years agoMerge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:09:31 +0000 (23:09 +0000)]
Merge "Fix NPE in FlashlightController" into lmp-dev

9 years agoam 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge...
smain@google.com [Thu, 19 Mar 2015 22:55:38 +0000 (22:55 +0000)]
am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '6784cf9945e01de63f67ed11a4925fa9879f2073':
  add Places API to the Location feature page

9 years agoam 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places...
smain@google.com [Thu, 19 Mar 2015 22:48:07 +0000 (22:48 +0000)]
am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '092a7893779455ca9d1a0ff34d9ccefb9ae709db':
  add Places API to the Location feature page

9 years agoam d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the...
smain@google.com [Thu, 19 Mar 2015 22:42:44 +0000 (22:42 +0000)]
am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page

9 years agoam 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature...
smain@google.com [Thu, 19 Mar 2015 22:35:16 +0000 (22:35 +0000)]
am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page

9 years agoam 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into...
smain@google.com [Thu, 19 Mar 2015 22:29:09 +0000 (22:29 +0000)]
am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page

9 years agoam 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:22:10 +0000 (22:22 +0000)]
am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page

9 years agoMerge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:16:11 +0000 (22:16 +0000)]
Merge "add Places API to the Location feature page" into lmp-docs

9 years agoam c077ee31: Merge "Added copyright notice and formatted to convention"
Yang Ni [Thu, 19 Mar 2015 21:41:59 +0000 (21:41 +0000)]
am c077ee31: Merge "Added copyright notice and formatted to convention"

* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention

9 years agoNew API methods for Script Group
Yang Ni [Wed, 11 Mar 2015 23:25:37 +0000 (16:25 -0700)]
New API methods for Script Group

Use a single vararg Object array for both kernel/invoke arguments
and global bindings. The assumption is that global bindings are in
the end after the kernel/invoke arguments.
This simplifies the api to add a kernel or invoke to a script group.

Change-Id: I7efb1035c5967e2cadd15e6fe27f20c80ba197a2

9 years agoam 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp...
Bryce Lee [Thu, 19 Mar 2015 21:30:43 +0000 (21:30 +0000)]
am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev

* commit '8320cf2de357265179c3007256394b0cbb69d949':
  Fix wrong intent being passed in PhoneWindowManager.

9 years agoMerge "Added copyright notice and formatted to convention"
Yang Ni [Thu, 19 Mar 2015 21:28:13 +0000 (21:28 +0000)]
Merge "Added copyright notice and formatted to convention"

9 years agoMerge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
Bryce Lee [Thu, 19 Mar 2015 21:24:51 +0000 (21:24 +0000)]
Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev

9 years agoam 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge...
Joe Fernandez [Thu, 19 Mar 2015 20:56:45 +0000 (20:56 +0000)]
am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit '8ca83e0504cb3b8d78c1a07bd49a73c58433671b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge...
Joe Fernandez [Thu, 19 Mar 2015 20:56:33 +0000 (20:56 +0000)]
am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" int

* commit '1e81b070f772fdef45d7bedc0de0304603e05a95':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge...
Joe Fernandez [Thu, 19 Mar 2015 20:56:25 +0000 (20:56 +0000)]
am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit '5c1a3ab4216333696947eefee4d022f708e4c053':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT...
Joe Fernandez [Thu, 19 Mar 2015 20:49:52 +0000 (20:49 +0000)]
am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit '0362d6e0c836cd48beb928f053d97dcc3961c110':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT...
Joe Fernandez [Thu, 19 Mar 2015 20:49:48 +0000 (20:49 +0000)]
am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'e41abf4a304675bda37de7b796258f7f322d61ea':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT...
Joe Fernandez [Thu, 19 Mar 2015 20:49:41 +0000 (20:49 +0000)]
am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'd7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
Miao Wang [Thu, 19 Mar 2015 20:49:15 +0000 (20:49 +0000)]
am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"

* commit '2ef9955c827e0348a65b4f787e206925f4663197':
  [RenderScript] Remove duplicate include in jni

9 years agoam 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge...
Eric Gilmore [Thu, 19 Mar 2015 20:46:28 +0000 (20:46 +0000)]
am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '680f36a88ff1c43e928066122505ec05c50d9942':
  Changes for a quick, pre-migration bug sprint:

9 years agoam bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change...
Joe Fernandez [Thu, 19 Mar 2015 20:42:36 +0000 (20:42 +0000)]
am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated...
Joe Fernandez [Thu, 19 Mar 2015 20:42:30 +0000 (20:42 +0000)]
am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added...
Joe Fernandez [Thu, 19 Mar 2015 20:42:23 +0000 (20:42 +0000)]
am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for...
Eric Gilmore [Thu, 19 Mar 2015 20:38:49 +0000 (20:38 +0000)]
am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '66e529aa34034d044c496c330ba89026ee293253':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "[RenderScript] Remove duplicate include in jni"
Miao Wang [Thu, 19 Mar 2015 20:35:55 +0000 (20:35 +0000)]
Merge "[RenderScript] Remove duplicate include in jni"

9 years agoam b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for...
Joe Fernandez [Thu, 19 Mar 2015 20:35:09 +0000 (20:35 +0000)]
am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s...
Joe Fernandez [Thu, 19 Mar 2015 20:35:05 +0000 (20:35 +0000)]
am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'f761e4c20ee63873043522990487ecd15bb18966':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javado...
Joe Fernandez [Thu, 19 Mar 2015 20:34:59 +0000 (20:34 +0000)]
am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre...
Eric Gilmore [Thu, 19 Mar 2015 20:32:03 +0000 (20:32 +0000)]
am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
  Changes for a quick, pre-migration bug sprint:

9 years agoam c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API...
Joe Fernandez [Thu, 19 Mar 2015 20:28:54 +0000 (20:28 +0000)]
am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google...
Joe Fernandez [Thu, 19 Mar 2015 20:28:45 +0000 (20:28 +0000)]
am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'd91167e8ceda64809e9afd73ac184dc319a276f5':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google...
Joe Fernandez [Thu, 19 Mar 2015 20:28:40 +0000 (20:28 +0000)]
am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoFix wrong intent being passed in PhoneWindowManager.
Bryce Lee [Thu, 19 Mar 2015 20:27:26 +0000 (13:27 -0700)]
Fix wrong intent being passed in PhoneWindowManager.

When starting going home for Wear, the intent extra indicating the
intent is coming from a button press must be set. This was lost during
a merge conflict resolution.

Bug: 19832892
Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f

9 years agoam 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration...
Eric Gilmore [Thu, 19 Mar 2015 20:24:57 +0000 (20:24 +0000)]
am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
  Changes for a quick, pre-migration bug sprint:

9 years agoam dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp...
Joe Fernandez [Thu, 19 Mar 2015 20:21:47 +0000 (20:21 +0000)]
am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 20:21:43 +0000 (20:21 +0000)]
am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play service...
Joe Fernandez [Thu, 19 Mar 2015 20:21:37 +0000 (20:21 +0000)]
am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:"...
Eric Gilmore [Thu, 19 Mar 2015 20:17:22 +0000 (20:17 +0000)]
am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 20:16:31 +0000 (20:16 +0000)]
Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect...
Joe Fernandez [Thu, 19 Mar 2015 20:16:20 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla...
Joe Fernandez [Thu, 19 Mar 2015 20:16:03 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

9 years agoam efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge...
Rich Slogar [Thu, 19 Mar 2015 20:11:09 +0000 (20:11 +0000)]
am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'efa9bfac1aaa558ed6856581c424d6ffc507b0b1':
  docs: proguard help update

9 years agoam e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:10:55 +0000 (20:10 +0000)]
am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit 'e43a64e3336548094571885944afc28792e24fa0':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:05:49 +0000 (20:05 +0000)]
Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

9 years agoam e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguar...
Rich Slogar [Thu, 19 Mar 2015 20:02:31 +0000 (20:02 +0000)]
am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'e3d92a205b5c1bfde3ceff1fe4ca9a62cc5cb4fc':
  docs: proguard help update

9 years agoam 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update...
Rich Slogar [Thu, 19 Mar 2015 19:54:30 +0000 (19:54 +0000)]
am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit '983dd1a9d1dc5a6d0bc72fcbc87b5194df09c048':
  docs: proguard help update

9 years agoam b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp...
Rich Slogar [Thu, 19 Mar 2015 19:47:03 +0000 (19:47 +0000)]
am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'b569ec3cc1366e3e3caa96fa40a9fc14ed9c6121':
  docs: proguard help update

9 years agoam d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:39:27 +0000 (19:39 +0000)]
am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'd76aa14cf401ca794b585b2312528121c651a537':
  docs: proguard help update

9 years agoam d5885842: Merge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:10:06 +0000 (19:10 +0000)]
am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'd58858427e102bec7ebe1d2a8ce418529924a68c':
  docs: proguard help update

9 years agoMerge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:04:04 +0000 (19:04 +0000)]
Merge "docs: proguard help update" into lmp-docs

9 years agoam f75e4ca3: Merge "Make it harder to leak contexts"
Jason Sams [Thu, 19 Mar 2015 18:52:47 +0000 (18:52 +0000)]
am f75e4ca3: Merge "Make it harder to leak contexts"

* commit 'f75e4ca3945f4c299dc26f4c95d8d18ec74f41bb':
  Make it harder to leak contexts

9 years agoam f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition
Andres Morales [Thu, 19 Mar 2015 18:41:31 +0000 (18:41 +0000)]
am f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition

* commit 'f342e5e0ae85fa7929e9b2eb4213bbc85dbcf61c':
  Write correct checksum when formatting partition

9 years agoMerge "Make it harder to leak contexts"
Jason Sams [Thu, 19 Mar 2015 18:38:14 +0000 (18:38 +0000)]
Merge "Make it harder to leak contexts"

9 years agoam ca0391eb: am c8f952ce: Write correct checksum when formatting partition
Andres Morales [Thu, 19 Mar 2015 18:35:07 +0000 (18:35 +0000)]
am ca0391eb: am c8f952ce: Write correct checksum when formatting partition

* commit 'ca0391eb524b0adad79160c48682c4edf6f49ed2':
  Write correct checksum when formatting partition

9 years agoam c8f952ce: Write correct checksum when formatting partition
Andres Morales [Thu, 19 Mar 2015 18:27:54 +0000 (18:27 +0000)]
am c8f952ce: Write correct checksum when formatting partition

* commit 'c8f952ce9f9cadc0d38745e455c0a6388bc68a47':
  Write correct checksum when formatting partition

9 years agoam 89da4ca6: Merge "Remove unused printapk.cpp."
Elliott Hughes [Thu, 19 Mar 2015 18:19:54 +0000 (18:19 +0000)]
am 89da4ca6: Merge "Remove unused printapk.cpp."

* commit '89da4ca67d5bf6c35ea76f074cb2caa3d542740e':
  Remove unused printapk.cpp.

9 years agoMerge "Remove unused printapk.cpp."
Elliott Hughes [Thu, 19 Mar 2015 18:06:17 +0000 (18:06 +0000)]
Merge "Remove unused printapk.cpp."

9 years agodocs: proguard help update
Rich Slogar [Tue, 3 Mar 2015 20:27:16 +0000 (12:27 -0800)]
docs: proguard help update

b/19383794
b/19417644

Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764

9 years agoAdd android.security.NetworkSecurityPolicy.
Alex Klyubin [Thu, 12 Feb 2015 19:43:09 +0000 (11:43 -0800)]
Add android.security.NetworkSecurityPolicy.

The initial purpose of the NetworkSecurityPolicy class is to provide a
way for network libraries to check whether cleartext network traffic
(e.g., HTTP, WebSockets, XMPP, IMAP, SMTP) should be blocked from this
process.

The policy is set declaratively by the app developer in the app's
manifest and can be queried from ApplicationInfo.flags. Unfortunately,
several network stacks (bundled and unbundled) do not have a reference
to ApplicationInfo or Context.

Alternatives:
* Keep this API hidden (and thus potentially move it from framework to
  libcore), thus precluding unbundled HTTP stacks from using the API.
* Introduce a new java.lang.System property instead of this API.
  However, such properties are a mess and not as powerful/extensible
  as a public class.

Bug: 19215516
Change-Id: If22056a74d257bf1d805ebb4fc284240b3d338f1

9 years agoWrite correct checksum when formatting partition
Andres Morales [Thu, 19 Mar 2015 15:34:55 +0000 (08:34 -0700)]
Write correct checksum when formatting partition

OEM unlock enabled bit is not computed in the checksum,
causing OEM Unlocking to be disabled after the second
reboot.

Bug: 19829441
Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7

9 years agoam b7d997a7: Merge "Revert "Change jit properties to be debug properties""
Mathieu Chartier [Thu, 19 Mar 2015 16:58:59 +0000 (16:58 +0000)]
am b7d997a7: Merge "Revert "Change jit properties to be debug properties""

* commit 'b7d997a7b79c233869fdd5ad18b013caad4a7236':
  Revert "Change jit properties to be debug properties"

9 years agoMerge "Revert "Change jit properties to be debug properties""
Mathieu Chartier [Thu, 19 Mar 2015 16:44:58 +0000 (16:44 +0000)]
Merge "Revert "Change jit properties to be debug properties""

9 years agoRESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 16:39:43 +0000 (16:39 +0000)]
RESUBMIT: "Doc change: add docs for SafetyNet API.""

This reverts commit 1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0.

Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0

9 years agoRESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes...
Joe Fernandez [Thu, 19 Mar 2015 16:38:05 +0000 (16:38 +0000)]
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

This reverts commit 2a867108951807e467dbfe0fcd4cc48a4d7f4191.

Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4

9 years agoRESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Gener...
Joe Fernandez [Thu, 19 Mar 2015 16:36:02 +0000 (16:36 +0000)]
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

This reverts commit c0e9ac455568b2d82d191388708a281bdb376cc9.

Change-Id: Iccc75ead90c92602b25da70e13bcdd55a6d129b6

9 years agoam 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."
Alex Klyubin [Thu, 19 Mar 2015 16:21:40 +0000 (16:21 +0000)]
am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."

* commit '4177b8cbbfa239d68a9283124638d9399a5dd0de':
  Add app-level usesCleartextTraffic manifest attribute.

9 years agoMerge "Add app-level usesCleartextTraffic manifest attribute."
Alex Klyubin [Thu, 19 Mar 2015 16:10:20 +0000 (16:10 +0000)]
Merge "Add app-level usesCleartextTraffic manifest attribute."

9 years agoRemove unused printapk.cpp.
Elliott Hughes [Thu, 19 Mar 2015 16:03:41 +0000 (09:03 -0700)]
Remove unused printapk.cpp.

This is one of the few remaining users of libzipfile, but doesn't get built.
Not worth porting to libziparchive.

Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c

9 years agoam 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
Vinod Krishnan [Thu, 19 Mar 2015 09:42:46 +0000 (09:42 +0000)]
am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev

* commit '3f782ad156d337c7c6c542696ddc67ae82fa7a84':
  Make Theme.Micro point to Theme.Material

9 years agoMerge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
Vinod Krishnan [Thu, 19 Mar 2015 09:36:36 +0000 (09:36 +0000)]
Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev

9 years agoam bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge...
Joe Fernandez [Thu, 19 Mar 2015 05:56:57 +0000 (05:56 +0000)]
am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'bf6b1e00f1981061f5a11dffdb2cf2bf58792e4a':
  docs: updated Auto training landing page

9 years agoam ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated...
Joe Fernandez [Thu, 19 Mar 2015 05:52:21 +0000 (05:52 +0000)]
am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'ebaf79018b5bcfbe83f5877d5360a1c0d46d0b97':
  docs: updated Auto training landing page