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

207544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
c4e2bcd4dc Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 2015-07-15 23:30:19 +00:00
Svetoslav
1f1f0cee10 am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit 'eb16e1fb2225f2cf84f5c56242a187fba59e39f8':
  Make sure we get valid package name or fail.
 2015-07-15 23:30:09 +00:00
Dianne Hackborn
c1a49b50bf Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 2015-07-15 23:30:09 +00:00
Christopher Tate
ec0ed98da8 am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit 'b6b97e90cb247560b880ae7269b5bfb1daa7aeef':
  Resolve based on the correct user's default browser
 2015-07-15 23:30:05 +00:00
Dianne Hackborn
1cf8b0b6bf Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-15 23:29:56 +00:00
Jim Miller
de5b573e2a Fix the build 
Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
 2015-07-15 16:29:30 -07:00
Abodunrinwa Toki
7572e6940c am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit 'e3be3cc76d0208f0cd39f0d15561f8ee060cc487':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 23:21:35 +00:00
Miao Wang
3a0f2f666e am f256091e: am 469b4114: am 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev 
* commit 'f256091ecf56f53f4cf3f4d9e2649fc9bb5bdd84':
  fix BNNM docs
 2015-07-15 23:18:46 +00:00
Svet Ganov
ffb4318447 am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '3d8e949a7767b204eb9504d3c5267de9e0fd6899':
  Grant default permissions to the setup app robustly.
 2015-07-15 23:18:40 +00:00
Geoff Mendal
08ae9f46ed am 33c8f11e: (-s ours) am 40e3b4b5: (-s ours) am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '33c8f11ea9dafef34bd4d41016ad7c74970cf557':
  Import translations. DO NOT MERGE
 2015-07-15 23:18:34 +00:00
Adrian Roos
fcc177438d am 25cc5654: am c71f3a2d: am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '25cc56544ca9f62a96f42b108c8d01e0d4ed2872':
  Show correct locked orientation on phones
 2015-07-15 23:18:28 +00:00
Geoff Mendal
e90516a435 am 4e9cb4e2: (-s ours) am c7167010: (-s ours) am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4e9cb4e294f4227afb5589509efb6d95a208a8de':
  Import translations. DO NOT MERGE
 2015-07-15 23:18:21 +00:00
Geoff Mendal
9d5713c708 am 812ad1aa: (-s ours) am a2ab4fc8: (-s ours) am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '812ad1aa4e9f0558e800bbc234a278f205b1e8a8':
  Import translations. DO NOT MERGE
 2015-07-15 23:18:13 +00:00
Geoff Mendal
b0524c338c am 34cfc5c8: (-s ours) am c05bf35e: (-s ours) am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '34cfc5c83ddaad59c9aa8cf047b36f73e5dfee65':
  Import translations. DO NOT MERGE
 2015-07-15 23:18:06 +00:00
Geoff Mendal
b5f916187a am e82dcd32: (-s ours) am 80e9c04e: (-s ours) am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e82dcd329f186637a7fd23d11a0e123612ee6d4a':
  Import translations. DO NOT MERGE
 2015-07-15 23:18:01 +00:00
Geoff Mendal
3470c4ec54 am 2ce2c764: (-s ours) am 69032a7a: (-s ours) am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '2ce2c76498a29e91bba9f53ec80da2ed48bcc031':
  Import translations. DO NOT MERGE
 2015-07-15 23:17:55 +00:00
Geoff Mendal
67cb587306 am eafe2996: (-s ours) am 15aa75e3: (-s ours) am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'eafe2996e76744e0c4b1de5c68cb5d43f5b8069c':
  Import translations. DO NOT MERGE
 2015-07-15 23:17:48 +00:00
Geoff Mendal
b0e5be970a am bd7caa7c: (-s ours) am 97eabdbd: (-s ours) am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'bd7caa7c1c0c7ad871e76554975003f9be7646e5':
  Import translations. DO NOT MERGE
 2015-07-15 23:17:42 +00:00
Jorim Jaggi
dd441eaaca am aa90ab55: am deb9aa8c: am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'aa90ab551c9ba08489feae32c71efabac51062cc':
  Adjust assist disclosure stroke width to spec
 2015-07-15 23:17:36 +00:00
Roshan Pius
84b9c3010e am 0d49a97e: am 31ab86f8: am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev 
* commit '0d49a97e4a098ca120207b3ec4cb068111d89fec':
  Handle exceptions when accessing Content providers.
 2015-07-15 23:17:29 +00:00
Felipe Leme
7ef4daa26b am 1bcd49a9: am 2ac41a90: am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '1bcd49a9ebae6a82d601449dd182a18948803dd9':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 23:17:06 +00:00
Dianne Hackborn
4de824e2bb am de5cc883: am f57b5e6f: am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev 
* commit 'de5cc88306cccdfe998ffafed4830b5db45b2ffd':
  Fix build.
 2015-07-15 23:17:00 +00:00
Jeff Brown
209c8cedab am 6e4997db: am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '6e4997dbfb5f0a2abac99522a52b557172757ee2':
  Add USB port manager.
 2015-07-15 23:16:55 +00:00
Jeff Brown
852e51e23d am 3bc33423: am b35b8e81: am b3c11805: am 2dbccc19: Clean up USB Manager dump. 
* commit '3bc33423477945a0f97ebe7948af642cc56cea7b':
  Clean up USB Manager dump.
 2015-07-15 23:16:45 +00:00
Svetoslav
eb16e1fb22 am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit '08dda27be4678f2ab5bdc7e210d511ec105c158c':
  Make sure we get valid package name or fail.
 2015-07-15 23:13:03 +00:00
Christopher Tate
b6b97e90cb am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit '06476508c4aae6b9bb5affdc7470abf159ef9eda':
  Resolve based on the correct user's default browser
 2015-07-15 23:12:59 +00:00
Svetoslav
08dda27be4 Merge "Make sure we get valid package name or fail." into mnc-dev 2015-07-15 23:03:49 +00:00
Abodunrinwa Toki
e3be3cc76d am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit 'b277786736e41525a232ad7ecb61de706311b295':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 23:03:45 +00:00
Svetoslav
7395cbf070 Make sure we get valid package name or fail. 
bug:22492225

Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
 2015-07-15 15:58:44 -07:00
Miao Wang
f256091ecf am 469b4114: am 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev 
* commit '469b4114bae83edeb92e420b5e688edc594df58b':
  fix BNNM docs
 2015-07-15 22:58:03 +00:00
Svet Ganov
3d8e949a77 am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '9088c083e6c66d44d3fe332de48b661dfe017254':
  Grant default permissions to the setup app robustly.
 2015-07-15 22:57:56 +00:00
Christopher Tate
06476508c4 Merge "Resolve based on the correct user's default browser" into mnc-dev 2015-07-15 22:57:53 +00:00
Geoff Mendal
33c8f11ea9 am 40e3b4b5: (-s ours) am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '40e3b4b5c10dbde39486a30bf37d13bf1464dfa5':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:51 +00:00
Adrian Roos
25cc56544c am c71f3a2d: am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit 'c71f3a2d4a3b3ab52be08e68646ffcb71b55066a':
  Show correct locked orientation on phones
 2015-07-15 22:57:45 +00:00
Geoff Mendal
4e9cb4e294 am c7167010: (-s ours) am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c71670109681040c676895b1db962753db0414e9':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:40 +00:00
Geoff Mendal
812ad1aa4e am a2ab4fc8: (-s ours) am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a2ab4fc82629f200d93fa77a29094ff3ecb86af3':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:34 +00:00
Geoff Mendal
34cfc5c83d am c05bf35e: (-s ours) am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c05bf35e1771191d2f006e32f99a1d11479c2057':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:28 +00:00
Geoff Mendal
e82dcd329f am 80e9c04e: (-s ours) am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '80e9c04e910f88283f34dddac36f32db291e9c63':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:22 +00:00
Jeff Sharkey
38c60b3fcb am 87ef89a2: am 38611265: am 973e7227: am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '87ef89a2e5e7163ee24e993c20e263d35bb0b109':
  Give DCS permission needed to measure all users.
 2015-07-15 22:57:17 +00:00
Geoff Mendal
2ce2c76498 am 69032a7a: (-s ours) am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '69032a7a237f58a4b7f8f273cbce8cd25285b84b':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:16 +00:00
Geoff Mendal
eafe2996e7 am 15aa75e3: (-s ours) am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '15aa75e3f86f6a10512925f117240d7d2d8b291b':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:10 +00:00
Geoff Mendal
bd7caa7c1c am 97eabdbd: (-s ours) am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '97eabdbdc943ec361de9cb948676a75adc2723e8':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:05 +00:00
Jorim Jaggi
aa90ab551c am deb9aa8c: am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'deb9aa8cfd89c04d130758f9a82e45f77bba0431':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:56:59 +00:00
Roshan Pius
0d49a97e4a am 31ab86f8: am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev 
* commit '31ab86f871be369075dd3432dcd4ebed14e50a78':
  Handle exceptions when accessing Content providers.
 2015-07-15 22:56:53 +00:00
Felipe Leme
1bcd49a9eb am 2ac41a90: am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '2ac41a902eb4e2af32ff4063dca03b656baa860f':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:56:46 +00:00
Dianne Hackborn
de5cc88306 am f57b5e6f: am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev 
* commit 'f57b5e6f23b9ec6f98d4af75072b87b09303e62d':
  Fix build.
 2015-07-15 22:56:39 +00:00
Jeff Brown
6e4997dbfb am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '8bdd92d44ea878ff0353c87cfc5ce497aea96911':
  Add USB port manager.
 2015-07-15 22:56:33 +00:00
Jeff Brown
3bc3342347 am b35b8e81: am b3c11805: am 2dbccc19: Clean up USB Manager dump. 
* commit 'b35b8e81cafe52552f800c736ce123d2b1969387':
  Clean up USB Manager dump.
 2015-07-15 22:56:28 +00:00
Jeff Sharkey
177c9c8c14 Merge commit '3bc83eb0' into downstream 
Change-Id: Id3980b39889f28ab42284119747eb461be0a3ce5
 2015-07-15 15:54:20 -07:00
Abodunrinwa Toki
b277786736 am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '6a4014104e85bf4154b353cd0be337f7967cdaeb':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 22:50:16 +00:00