Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,284 Commits 3 Branches 0 Tags
74155c2ea81d1eff005cbedee3b6f1578ea5ac0d
Commit Graph

40180 Commits

Author SHA1 Message Date
Ruben Brunk
74155c2ea8 am eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 
* commit 'eb08250a9bb7ad87518be9454eb9451d9b08c62f':
  camera2: Undo mirror for front camera in legacy mode.
 2014-09-05 19:00:27 +00:00
Wei Wang
135b3f4668 am 294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev 
* commit '294383ccc75090a4c616bef02dcd7572dcca6004':
  Unregister app when advertise failed after registration.
 2014-09-05 19:00:19 +00:00
Ruben Brunk
8eca9e0f0b Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 2014-09-05 18:52:54 +00:00
Wei Wang
6550557f99 Merge "Unregister app when advertise failed after registration." into lmp-dev 2014-09-05 18:49:27 +00:00
Svetoslav
ef88eea8e8 am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit 'b1d65d187db52c541ac71b5b9e3f34f15eb3001f':
  Fix runtime restart
 2014-09-05 18:38:11 +00:00
Svetoslav
df11867be3 Merge "Fix runtime restart" into lmp-dev 2014-09-05 18:30:42 +00:00
Svetoslav
7de2abb16c Fix runtime restart 
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
 2014-09-05 11:28:00 -07:00
Jeff Sharkey
e167e433ba am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev 
* commit 'a32e4e6b1fafed78546f8084eea78e641a92124d':
  Allow badging updates to install sessions.
 2014-09-05 17:59:14 +00:00
Eino-Ville Talvala
eeb04cf2db am f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev 
* commit 'f62fb8f94ac595d31da73fd791a2738737a13efa':
  Camera2: Document supported target combinations for a session.
 2014-09-05 17:59:10 +00:00
Chris Craik
3fa19375c9 am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 
* commit '8ff3e227327d21bf8269af47efa4d91b6a32613b':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
 2014-09-05 17:59:06 +00:00
Jeff Sharkey
43a2d06166 Merge "Allow badging updates to install sessions." into lmp-dev 2014-09-05 17:56:39 +00:00
Eino-Ville Talvala
48980da14d Merge "Camera2: Document supported target combinations for a session." into lmp-dev 2014-09-05 17:54:01 +00:00
Chris Craik
def8a37128 Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 2014-09-05 17:49:20 +00:00
George Mount
5db55f2605 am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev 
* commit '1377fe31f3d655e5d764b213904131f7e75a870d':
  API Review: Improve javadoc.
 2014-09-05 17:35:48 +00:00
Chris Craik
96890564bd Replace native crash with IAE when calling picture.draw() w/ a HW canvas 
bug:17397958
Change-Id: I75f942db0e604f9fd6ab31e6c81f718c0f57b16a
 2014-09-05 10:33:39 -07:00
George Mount
0ff16cf43a Merge "API Review: Improve javadoc." into lmp-dev 2014-09-05 17:29:29 +00:00
George Mount
f9557619a7 API Review: Improve javadoc. 
Bug 17189781
Also rename PatternMotion to PatternPathMotion

Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
 2014-09-05 10:27:27 -07:00
Jeff Sharkey
ec9bad2015 Allow badging updates to install sessions. 
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded.  This change relaxes to allow an installer to update
their session badging after the session has been created.  Notify
observers when badging changes.

Rename callback registration methods to match style guide.  Relax
constraint that observers are home app.  Fix bug around internal
progress reporting.

Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
 2014-09-05 10:15:15 -07:00
Svetoslav
ba2957829e am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '4c8c9ac06fc213d9bc9d82c39d55f425fee5b429':
  Update FrameStats API per api-council request.
 2014-09-05 17:12:44 +00:00
Svetoslav
59c1be6684 am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
  Addressing API council comments for UserManager.
 2014-09-05 17:12:40 +00:00
Amith Yamasani
116b5865cf am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev 
* commit '3c0a511dee505d46ebab80a9b5a1579d39e597fd':
  Remove class that was moved to a different package.
 2014-09-05 17:12:31 +00:00
Svetoslav
c5564b8c0e Merge "Update FrameStats API per api-council request." into lmp-dev 2014-09-05 17:09:45 +00:00
Svetoslav
e2da374d6e Merge "Addressing API council comments for UserManager." into lmp-dev 2014-09-05 17:08:12 +00:00
Svetoslav
53dcd394aa Update FrameStats API per api-council request. 
bug:17390382

Change-Id: I50518834569f4d0ec394709294537256f03530e0
 2014-09-05 10:07:02 -07:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager. 
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
 2014-09-05 10:07:02 -07:00
Amith Yamasani
d50f8c46f6 Merge "Remove class that was moved to a different package." into lmp-dev 2014-09-05 17:03:31 +00:00
Jeff Sharkey
ec50db2b13 am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev 
* commit 'e7bea8e53ba42dc7a6de18dc19f7b1fcfa7bbdf7':
  Move Size parceling to Bundle.
 2014-09-05 16:51:18 +00:00
Jeff Sharkey
d3cc74cac2 Merge "Move Size parceling to Bundle." into lmp-dev 2014-09-05 16:46:00 +00:00
Amith Yamasani
36d8d25860 Remove class that was moved to a different package. 
Completes the API change.

Bug: 17006805
Change-Id: I5031e05df6b1a317a902482274eb056ecaf5dfbb
 2014-09-05 09:42:59 -07:00
Amith Yamasani
a56911838c am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev 
* commit '0c3b7b1567d591a5723456f9935dc00e4131daff':
  Don't allow guests to install from unknown sources
 2014-09-05 16:41:13 +00:00
Amith Yamasani
a240d8377a Merge "Don't allow guests to install from unknown sources" into lmp-dev 2014-09-05 16:32:30 +00:00
Robert Greenwalt
e2565c0ecc am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev 
* commit 'a155ef8135420584325cbe94967058b3f83e88b0':
  Fix networking API per scripting checks.
 2014-09-05 16:20:05 +00:00
Robert Greenwalt
a0843f4967 Merge "Fix networking API per scripting checks." into lmp-dev 2014-09-05 16:17:26 +00:00
Jeff Sharkey
5ef33984d0 Move Size parceling to Bundle. 
Size itself shouldn't be Parcelable, since that would be a layering
violation.

Bug: 17390381
Change-Id: Ica62709bd889db51c916c550a0146714b002baa3
 2014-09-05 09:07:35 -07:00
Dharmesh Mokani
2b6bd1df2d am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit 'efd4ea013b00a1b645afde65bae56dc0a8370276':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 16:04:23 +00:00
Dharmesh Mokani
19b210c98c Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 2014-09-05 15:56:17 +00:00
Alexandra Gherghina
de74c2c1d2 am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev 
* commit 'e27eb3ec797a5a9621fc4eece3579bb4fcbf0363':
  Rename intent extra following API review
 2014-09-05 15:31:07 +00:00
Marcin Kosiba
e288c4f43d am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 
* commit '210d7b224da0425b3c65888ac49abd1c6ef9f846':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
 2014-09-05 15:31:03 +00:00
Chris Wren
d717a4bbe2 am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit 'b59b5205ff9c784085bf6b85bceb496e608fc042':
  Keep contact affinities separate across users.
 2014-09-05 15:30:59 +00:00
Esteban Talavera
385c145e2b am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '2c6aa357bddb428193c0c006d9535f208b9d8903':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 15:30:52 +00:00
Anwar Ghuloum
d8541e438b am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev 
* commit 'f8545bc6f498e0b93f7ee42e51ea0ff05e695731':
  Timing Hacks DO NOT MERGE
 2014-09-05 15:30:49 +00:00
George Mount
d85dd0fd1f am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 
* commit 'b555f0cf77c66c9d8204146c3f16e27cf83c4ed8':
  Fix selection of epicenter in Activity Transitions.
 2014-09-05 15:30:45 +00:00
George Mount
2654657fca am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev 
* commit 'da6df616bc21eabf56ff9de8f8606898fc388e60':
  Fix NPE when Window disappears during a transition.
 2014-09-05 15:30:41 +00:00
George Mount
371d00e4b0 am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 
* commit '472294569a26cb60d75202d5bc13e44fb040dbce':
  API Review: Change SharedElementListener to SharedElementCallback.
 2014-09-05 15:30:27 +00:00
Martin Kosiba
3046b13006 am c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev 
* commit 'c3ec88fd433540729a4a818d4d01b21cf2106835':
  Change WebView.zoomBy return type to void.
 2014-09-05 15:30:16 +00:00
Winson Chung
aeab63fb1d am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 
* commit '927df1c290c65ae877b67e2383517494ee7afb68':
  Generalizing Recents widget category to Search box. (Bug 17334589)
 2014-09-05 15:30:12 +00:00
Kenny Guy
c57a8701b6 am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 
* commit '42484d4365201d4250ebedb2f4cd6348c626b158':
  Fix RemoteViews to inflate views for current user.
 2014-09-05 15:29:50 +00:00
Alexandra Gherghina
f363bda252 Merge "Rename intent extra following API review" into lmp-dev 2014-09-05 15:16:02 +00:00
Marcin Kosiba
8d4e83aca0 Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 2014-09-05 15:13:40 +00:00
Chris Wren
c237555c6c Merge "Keep contact affinities separate across users." into lmp-dev 2014-09-05 14:58:40 +00:00